Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 17 Jul 2010 10:55:12 +0000 (10:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 17 Jul 2010 10:55:12 +0000 (10:55 +0000)

Trivial merge